(server-unload-function): Unbind `server-edit' from `C-x #'.

(server-unload-function): Remove variable.

diff --git a/lisp/server.el b/lisp/server.el
index 6af9b9952d6b61f6d25a00c696d0b15e9636afbb..9eef2906f7dea739b2229a6ca5ada4aec78966f3 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -767,6 +767,7 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
 (defun server-unload-function ()
   "Unload the server library."
   (server-mode -1)
+  (substitute-key-definition 'server-edit nil ctl-x-map)
   (save-current-buffer
    (dolist (buffer (buffer-list))
      (set-buffer buffer)
@@ -775,7 +776,6 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
   nil)
 
 (add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit.
-(defvar server-unload-function 'server-unload-function)
 \f
 (provide 'server)